deploy: Fix overriding kernel args for staged deployments
authorColin Walters <walters@verbum.org>
Mon, 9 Jul 2018 16:22:10 +0000 (12:22 -0400)
committerAtomic Bot <atomic-devel@projectatomic.io>
Mon, 9 Jul 2018 18:04:57 +0000 (18:04 +0000)
commitfef07889d38c55406d687c81b0b29e86532189dc
tree30c89e0df3044f4ec9958ef87872eab7eac72cd6
parentc7b12a8730260c66bc96363a3a3c5805b325bac8
deploy: Fix overriding kernel args for staged deployments

This is the inverse of https://github.com/ostreedev/ostree/pull/1558
aka commits cadece6c4f398ca61d21e497bd6e3fbb549f9cf6 and
3358698c86d80821d81443c906621c92672f99fb

Needed to fix `rpm-ostree kargs` test suite with default staging; skipping
a test here for now as eventually what we'll do is turn on the rpm-ostree
suite fully here.

Closes: #1677
Approved by: jlebon
src/libostree/ostree-sysroot-deploy.c